Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Movielike Crit #335

Merged
merged 15 commits into from
Aug 28, 2024
Merged

Movielike Crit #335

merged 15 commits into from
Aug 28, 2024

Conversation

Merrgear
Copy link
Contributor

About the pull request

Makes crit more of a movielike ordeal, removes the unconscious part and allows you to scream for help and on comms and the like. Also by addition makes paincrit not knock you out anymore, Overall allowing more RP even when you are out of the count for combat, and reducing the boring softcrit hell loop.

This PR does NOT touch any other item that would knock you out. explosives, huggers, chems, ect still will knock you out.

This PR also touches AI code, this is to make sure they stop targeting you after you go on the ground in the new critstate. PLEASE DO NOT MERGE THIS PR WITHOUT TMs FOR THIS REASON

Explain why it's good for the game

More RP when out for the count, true Weirzbowski larp! *scream when you get dragged away! no more silly whitescreen simulator for the entirety of crit

Changelog

🆑
qol: made crit less boring
code: changed the crit code to not knock you unconcious
🆑

@Doubleumc Doubleumc added the needs tested testmerge this to see what breaks label Jul 24, 2024
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the status effects don't apply TRAIT_FLOORED when "merely" unconscious, need to check the body_position directly.

@Doubleumc
Copy link
Contributor

Oops, my mistake. In capture_override_behavior will need to change this line:


To var/mob/living/parent_mob = parent.

The body_position var only exists on living mobs and the code can't automatically assume that a mob is a living mob.

@Doubleumc Doubleumc removed the needs tested testmerge this to see what breaks label Aug 9, 2024
Doubleumc
Doubleumc previously approved these changes Aug 13, 2024
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Replacing instances of apply_effect(x, WEAKEN) with:

KnockDown(x)
Stun(x)

code/datums/effects/mob_crit/human_crit.dm Outdated Show resolved Hide resolved
code/datums/effects/pain/human_pain.dm Outdated Show resolved Hide resolved
code/datums/effects/pain/human_pain.dm Outdated Show resolved Hide resolved
@Doubleumc Doubleumc merged commit 79a6782 into cmss13-devs:master Aug 28, 2024
35 checks passed
cm13-github added a commit that referenced this pull request Aug 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants